From: Joakim <joakim@localhost.localdomain>
Date: Thu, 19 Aug 2010 07:34:21 +0000 (+0200)
Subject: upstream merge
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~6899^2~2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d1ee12099263360ce5cebee86ecbcdeb060a6861;p=emacs.git

upstream merge
---

d1ee12099263360ce5cebee86ecbcdeb060a6861